Adding flags mamangement