Moving TimeInCurrentState to SystemState object