Refactoring for new build
Bump to 0.0.9