Updated InputManager