Add support for flags