Converted collections to use generics