Updating ResourceMapper

Pulling from Chandan's Code