API Helper refactoring