Improved keystore, it will just save when something has been added