change more functions to Classes in schemas