Major refactoring on 0.0.8