modify to add WHITESTUFFS* parser
modify WAQL interfaces