Add support for clss selection