ENH: Add with statement