Fixed collection names, added object conversion.