Introduced collectionHandler; cleaned up public vs private.