Ensure forward compatibility by not interfering with id matching