[WIP] Specify handler components explicitly

Spike for exploring requirement 75.