changes for normalized dao access