- moved message forwarding to modules