Added v10 support