Improved Input definition so that now it is actually usable