Added many more classes to the options available.