Remove Api and add Uri class