Removed generics from I18NBundle and added TextFormatter.