Improve generate entity form