Added initial simplying of models for API calls
Added initial simplying of models for API calls