Refactored SBML logic