Refactored RoundTypes and RoleTypes