Actualizing lib to support v3.