Update for using-block changes