remove support for __token special method and added for __arguments special method. using "-" as tokenDelimiter