Fixed add/remove cluster in class: now default cluster is updated too