Updated some code.
Adding flag configuration parameters.