Refactor friendly forwarding