Refactor
Singular resources