[Finished #54239610 #54199554] Finish user data modeling logic