#2 Some refactoring of CombinedResourceHandler