FIxup collector
Fixup collector
Add coordinate collectors