Not sure to understand what you mean. src/host/layer23/src/common/sim.c is the same in both branches. we also have a struct gsm_sim in struct osmocom_ms. Would that struct be the place to store the sim callbacks? Sebastien