Changed Uid convention