Refactor ResXProvider