A few updates
New files for event and APIToken