Helpers reorganised, better interface, more organised code.