Removed UriRepository
Used beberlei/assert for input validation