Added enhanced version of Dozer mapper