add more sytax support