Updated Class Handling & Added Join Event