I agree with your suggestion. The more classes that are implemented the harder it is to get the weapon you need.