Added proxy, added event handler