added agreement and short url support