Add close support