CORE-4713: Implemented flag argument enhancement