Reduced duplication for proxy