Improvements to syntax