Updated timeout to be only applied for RUNNING state. For Idle, I've added 2 hour (I will add functionality to override this in the future)