quick changes to use DBIx::DataStore instead of SQL::Wrapper