Add with-blocks