Added more capabilities for indexed collections