Switched to map and json-smart