Fix Collection serialization