Added simulator class