Reworked URL scheme