diff --git a/doc/reference.rst b/doc/reference.rst
index 37d2742c561b0b446157de3856d481583f2d0912..05ebf4946c8b11a4def69aa7b30e14edda8bd25b 100644
--- a/doc/reference.rst
+++ b/doc/reference.rst
@@ -372,6 +372,9 @@ Schedule
 .. autoclass:: Schedule
     :members:
 
+Schedule Node
+-------------
+
 .. autoclass:: ScheduleNode
     :members:
 
@@ -389,6 +392,10 @@ Access Info
 
 .. autoclass:: AccessInfo
     :members:
+
+Union Access Info
+-----------------
+
 .. autoclass:: UnionAccessInfo
     :members:
 
@@ -403,6 +410,10 @@ Flow
 
 .. autoclass:: Flow
     :members:
+
+Union Flow
+----------
+
 .. autoclass:: UnionFlow
     :members:
 
diff --git a/gen_wrap.py b/gen_wrap.py
index deaf77ba4895698c0f3cca013c60831a753ddf4b..8deee91ca2fcdb165b690747e3214b6333e2b2cc 100644
--- a/gen_wrap.py
+++ b/gen_wrap.py
@@ -168,8 +168,7 @@ CLASSES = [
         "qpolynomial", "pw_qpolynomial",
         "term",
 
-        "band", "schedule_constraints", "schedule",
-        "schedule_node",
+        "band", "schedule_constraints", "schedule_node", "schedule",
 
         "access_info", "flow", "restriction",
         "union_access_info", "union_flow",
@@ -1511,6 +1510,7 @@ def gen_wrapper(include_dirs, include_barvinok=False, isl_version=None):
     fdata.read_header("isl/mat.h")
     fdata.read_header("isl/band.h")
     fdata.read_header("isl/schedule.h")
+    fdata.read_header("isl/schedule_node.h")
     fdata.read_header("isl/flow.h")
     fdata.read_header("isl/options.h")
     fdata.read_header("isl/ast.h")
diff --git a/islpy/__init__.py b/islpy/__init__.py
index 2d05572602b40d1633986c68c262fe311a104796..f9f339e4e89f6af7266a12cbed86eaff5dffab10 100644
--- a/islpy/__init__.py
+++ b/islpy/__init__.py
@@ -60,6 +60,7 @@ MultiAff = _isl.MultiAff
 MultiPwAff = _isl.MultiPwAff
 PwMultiAff = _isl.PwMultiAff
 UnionPwMultiAff = _isl.UnionPwMultiAff
+UnionPwAffList = _isl.UnionPwAffList
 MultiUnionPwAff = _isl.MultiUnionPwAff
 Id = _isl.Id
 Constraint = _isl.Constraint
@@ -83,9 +84,9 @@ QPolynomial = _isl.QPolynomial
 PwQPolynomial = _isl.PwQPolynomial
 Term = _isl.Term
 Band = _isl.Band
-Schedule = _isl.Schedule
 ScheduleConstraints = _isl.ScheduleConstraints
 ScheduleNode = _isl.ScheduleNode
+Schedule = _isl.Schedule
 AccessInfo = _isl.AccessInfo
 Flow = _isl.Flow
 Restriction = _isl.Restriction
@@ -96,28 +97,28 @@ AstNode = _isl.AstNode
 AstPrintOptions = _isl.AstPrintOptions
 AstBuild = _isl.AstBuild
 
-stat = _isl.stat
-fold = _isl.fold
-dim_type = _isl.dim_type
-error = _isl.error
+format = _isl.format
 ast_expr_type = _isl.ast_expr_type
+yaml_style = _isl.yaml_style
+error = _isl.error
+dim_type = _isl.dim_type
 ast_loop_type = _isl.ast_loop_type
 ast_node_type = _isl.ast_node_type
+stat = _isl.stat
+fold = _isl.fold
 ast_op_type = _isl.ast_op_type
-format = _isl.format
-yaml_style = _isl.yaml_style
 
 ALL_CLASSES = [Options, Context, IdList, ValList, BasicSetList, BasicMapList,
         SetList, MapList, UnionSetList, ConstraintList, AffList, PwAffList,
         BandList, AstExprList, AstNodeList, IdToAstExpr, Printer, Val,
         MultiVal, Vec, Mat, Aff, PwAff, UnionPwAff, MultiAff, MultiPwAff,
-        PwMultiAff, UnionPwMultiAff, MultiUnionPwAff, Id, Constraint, Space,
-        LocalSpace, BasicSet, BasicMap, Set, Map, UnionMap, UnionSet, Point,
-        Vertex, Cell, Vertices, QPolynomialFold, PwQPolynomialFold,
-        UnionPwQPolynomialFold, UnionPwQPolynomial, QPolynomial, PwQPolynomial,
-        Term, Band, Schedule, ScheduleConstraints, ScheduleNode, AccessInfo,
-        Flow, Restriction, UnionAccessInfo, UnionFlow, AstExpr, AstNode,
-        AstPrintOptions, AstBuild]
+        PwMultiAff, UnionPwMultiAff, UnionPwAffList, MultiUnionPwAff, Id,
+        Constraint, Space, LocalSpace, BasicSet, BasicMap, Set, Map, UnionMap,
+        UnionSet, Point, Vertex, Cell, Vertices, QPolynomialFold,
+        PwQPolynomialFold, UnionPwQPolynomialFold, UnionPwQPolynomial,
+        QPolynomial, PwQPolynomial, Term, Band, ScheduleConstraints,
+        ScheduleNode, Schedule, AccessInfo, Flow, Restriction, UnionAccessInfo,
+        UnionFlow, AstExpr, AstNode, AstPrintOptions, AstBuild]
 
 # }}}