Added EventHandlers and Proxy Classes