Made ID's more robust