Unique flag handling was added