Updated after adding optional 'topic' option