Added support for flag #