Refactor for 1.0