Updated for lib_v2.