Syntax changes and improvements