Memory leak fix and improved didMapObjectFromJSON method