Refactored for additional modules
Added a DoPrivileged interceptor