Add UID parameter (thanks to Jerome Roberts)