Updated to index the resource