Simplified the DataEntityGenerator