Added FlagType and License
Fixed critical bug