Added some input helpers and a selector