Set isManaged Flag
Code Refactor
Backward Compatibility Support