Add close, reopen and comment feature