Reimplemented url building using Strategy pattern