User Schema Fix