Add uid support