Merge "Revert "Refactor generateModel""