Added flag support.