Added closing support