Changed data array into object
Fixed extraction of Makernotes