Refactored parseModels