v0.1.11.0 - a bit of refactoring