Changes to host & user manager