Deal with the variables set to the empty string
Add support for flags