corrected the Mapping code in Repository layer