Add json builder & beautyfuckation