Expanded class hierarchy of StorageFilter