modifications to support running as user scope