Improved how settings maintain for signatures