JSON and path improvements