Updated CPK-core lib