Added the URI Handler pieces.