Update to 1.6 Refactor