Add URLLoader and modified parser