User Id related changes