Updated resource manager and user manager