Adds v7 support