Add passport, refactor to Event