GPII-153: All classes added