Performance improvements in LockListener