Made URI handler work