Add CP Libraries - part 2