Resource & TAO refactoring.