Adding new classes to define later which functions should be used