Added key figure functionality