models generation improved