Added some user complete functionality