Use states instead of pillars to define collectors