Use named urls instead hard-coded (Fix #78)