Add helpers and refactoring