Support Variables and fix missing parser.h entry