Refactoring and verified resources and collections