Refactored some class
Event visible to all users