Adding user  class and updating login level checks