added Category and relationships
Merge origin/master