I agree, I'll move it under Dispatcher.