Add close methods to related classes