Some improvements
Url generator service, more security