Added the no_keep_message option