Add support for upcoming $class annotation change