Added Automapper, fixed null infinitive bug