Merged branch to use DtoProvider