Added FK's to entities to avoid navigation property update issues.