Added close support