Added an IDataStorage interface.