Improved input manager