Updated keys for indicators