re-add flags support.