Keyword support and made DollarParser non static