Added support for @FirstClass(name)