Many Changes in User Auth Model