Improved location / referencing of resources and templates.