Add perfect forwarding for little improvement