Better uri handling.