refactoring to use uri parameters construnction.