Refactor World model