add handling of custom collectors