Align to new lib changes