CMS-3570 Updated some more classes to use new framework.