Towards better URI handling