Add support-v4 for testing