Add Simulator for testing purposes