AutoMapper integration added