Improve Events API draft