Refactor for 0.6