Added handling for routed messages