Uri and Router classes were added