Update api to include Node and Value objects