Adding IdManager/LockManager and related Changes

No match.