Remove ID and add more info to User