Adding some DAO changes, to make it easier to do work