Adding v3 of the lib.