Updated contracts for cluster selectors