Add Alpha 7 support