Removed unwanted navigation properties and made entities simpler