Add support for class selection

Add support for class selection