Expand lib and build from BaB changes