Adding proxy pattern