Restructure updating users