Added uri handling.