changed uri and description handling