Addressed url and mapping issue