Added message forwarding