Reflected the changes in commonlib