Added Input and Sketcher classes