Added support for @identifier