changed keystore to map[string]string