Internal rewrite for API V3.