Update for new closure syntax