Add support for model_locations