Switched from assoc list to map

Fix decoding error