Reorg of resource detection...
Updates