Add syntax extensions
Fix bundle syntax