Update to properly branch lib and those using Class methods instead of functions call