Initial changes for Delivery
Added AutoMapper configuration