added recognition of ExtractClass + tests