Added time and tick to Simulator