Added comments and added some missing entity classes