Update for closure changes