Updated to the new v3 syntax