Syntax improvements
Release 2.4.0