Bug fixes and small refactoring. Breaking changes
Refactor