Added handling of translation key generation