Refactorings & extended helper API