Update tosca utils to remove code duplication