LockManager Preparing

Add some required field to the related classes.