Add uid stuff