Added possibility to choose different classes