Merge "Refactor ResourceConfig class"