Add support for $ token