Add TypeForwarders