Added Simulator class