updated support constructs