Modify PolicyGuard to use new locking API