Changed how details are passed to custom handlers