Unify helper signature