Modify current_user method