BREAKING CHANGE, until refactoring piece is done