Change to support flex and bison