Refactored DAO:  Versioned is now optional