Add definitions for 1.6.
Resolve 1.7 very vulgar.