10/20 re-generate Entity