Add flagging as nice to have