Version pre 0.2 refactoring