Added classes for input handling