Added additional initialization after models generated
Renamed functinos