factor out EventDescriptor from Controller
2 files changed