Added necessary states for routing