Make ID Parsing More Flexible