Fixed the relationship mapping for many-to-many and many-to-one relationships, added fresh db structure