Added support for @@ and ::