Fixing issues for end points
Fixing issues for end points