Improved the unit selection classes.