Changes to include more relationships
First checkin of Classes relationship