Class and race now use id instead of name