Upgraded DDLs and Added v6 Support