More classes in schema step