Improved input class