Add possibility to choose from variables of class