Changing StorageInterface into DatabaseInterface