Improve Imput Classes