add URL flexibility