Refactor in progress - removed 0.9 models