rework uri spec