Formatting
Fixed support for external resource bundles