AutoMapper project and Fixes