Added property to control when clustering is disabled