Added new features

... and rearranged Event.php