Changed 'default' for 'use'
Some changes related to instantiation of models