removed dependency on base_models