Re-added repositories & added AutoMapper