Updated URL structure