Moved the alternate classes stuff to a feature