Added handling of multiple sketchClasses