Added proxy pattern