Moved collection-getter to uid for access from handlers