Removed exception to allow for time varying parameters. Added enum as dependency.