Some refactoring to reflect last changes
Merge branch 'release/release_0.0.9' into production