COOK-4672 - Update library so it can be used in other libraries