Syntax changes to be more generic