Added hash and type to tree entries