Added key localization and category