Simplify message handling