Improving User table