Updated to work with latest org.neuroml.model