Refactor World model, update all files to support property changes