Fixing entity mappings
Building many to many assoc