Instanciate only if needed
Merge pull request #980 from MLoureiro/load_if_dont_exist

Instanciate only if needed