Refactored to Xi collections.