Fixed automapper. Basic functionality