Updated WID to handle sub IDs