Updated DataGen source models