Reworking SigTable