Updating intent handling