Complete rework of wblib