Add support for mark_answered flag