Replace hard coded urls with class constants
Merge remote-tracking branch 'origin/issue-396' into issue-396