Fixed keys and removed workgroups