Container no longer Singleton. Add event types