Update to new Handler interface