Adding flags feature