Added StructureMap and AutoMapper