Simplify creation / finding of resources
Refactor polymorphic relationships