Also make flag/key name less team restricted