Added AutoMapper, removed validation