Refactor to 0.0.8