Unify message handling