Refactored API and message forwarding feature.