Changed the way resources are identified