Refactor JadeModelFactory