Optimize User Model code