Final data model modification