Refactor model load