Add unblocking and remove logging of return json