Finished up DAO level changes