Refactored collection support to use markers.