Add InputHelper and switch to using it