Removed flagmanager from Additional as it's no longer needed