Refactoring the attrs resources