Feature/store in vault