Added a check to discriminate the old commonlib