Syntax updates to cluster class.