Better grouping(Update to previous request)

Removed CPPText as it causes issues on classes using it.