Added keystore management