Added the helpers.
Some more refactoring.