Syntax update + gradle support