Better support of events proxy