Add flagging capability