Feature/join event