Added missing classes and slots