add more flags

Change-Id: I9e63aacf9c19709fae9a1978702ac25ed4b47fb2