Back to 1.6 and using the 107 types as based types