Module 7 part 1 update

Updates of module 7.1. following the data used in previous modules and
with some changes due to v2.0.