Feature/scoped resources