Better handlig of the initial json request