Adding support for a production flag