Add key store handler