serialzations and DAO changes and tests