Regarding the data model changes

https://map.bnnd.eu.org/user/Zverik/diary/399871