Update of the v7 support