Added some support for additional flags.