Refactor for 1.0
1.0.0-alpha.1