Updated api to have URLs and tags