fixed Mappings in Repository layer and Model.Entities