Helpers implementation and bugfix.
Small refactor and interface methods implementation.