Updated CastCompanionLibrary