Grammar2Jigll updated to conver more symbol types for conversion