Update DAO factories to match Commons library