Added proxy implementation