changes to bring in line with cqrstemplate