Refactoring of the resource bundle controller