Updated to support multiple model files