added remaining datadefs