Add class and module classes