Updated schemas, added class sketches