Modified even more GenericSparseClusterImpl