Add wrapper classes for hybrid local/proxy use.