Switched to use of resource_bundles