o upgraded Modello version to 1.0 o improved models to use Modello new features (merged from 2.1.x branch r745216)