Make quickstart v1/v2 compatible