Updating how we generate account id in manifest/generator