Generic code moved to DataStore. "Interface" improved.