Further re-engineered DataStore for transition to SQL support