Refactor resources cat