Add sim-id. Uncompleted (needs code cleaning and save()