Add improvements for entity generator