All classes re-added