Modified GenericSparseClusterImpl
Modified even more GenericSparseClusterImpl