- Improve the way instance are initialised.

- Fix small bug for loading instance