Updated User Schema/Entitites