Changes made by Robert.

Added automapper.