Add support for actual class names/words