Resource controller rewriting
Merge conflict resolved