Upgrade to V0.7.1. Add supports for Generic
Accidentally checked in local testing files. Reversed.
Updated results