Upgrade to V0.7.1. Add supports for Generic