Add localization and CDI support