Removed unnecessary Mappings.

And implemented AutoMapper to perform dynamic mappings.