Added navigation properties to the entities