Main changes applied to manage global models