various on-the-wire enhancements and the DAO objects