Add base_class where needed