Expose more node types