Schema updated, some comments added to classes.