Added some assoc, category, and feature view entities; added comments, better organized