Update handlers to avoid resource address inconsistency