Input manager improvements