add flags support