Design changes for Data Manager (refs #307)