Adds resources model
Fixes merge conflicts