Improve the syntax usage to something more compatible