Add missing classes belonging to previous commit