Removed AutoMapper and instead used a converter