Refactoring with new ResourceBundleKey class.