Added support for setting a few more flags