Syntax overhaul