Encapsulated Simulation. Added EnumParser