Refactor model (sync)