Update for TS 0.9.5 and latest node type defs