TMP: generic registry work