Refactor Generate Entities
Fixed potential NPE