Updated version
Allows @ to start identifier, to support system vars