Add $parser support