Added proxy wrap