Refactor in the resource related classes and configuration holder