Modification on gwc classes