Syntax changes to conform to standard