Use helper instead of checking config directly