Add support for new flex syntax