Extend flag handling.