Refactoring. Initial support for v0.3.0