Changing QueuedResponse to use Entity and new Mapper