Better decode incoming JSON