Separate collection code from base geometric