Moved json_decode() to mapper