Improve auth, add type to UserGroup