Change documentation to use the new Handler system