AIG-98 Refactoring der Collections