Input handler more functionality