Reworked EF relationships, added model annotations