improve ccommon library