Syntax improvements