Docblocked and added event proxies