Reorg of resource detection...