Refactored public method support