#397 Done, but not ready for test

The issue is done, but not ready for test (There are image that doesn't
exist yet and the methods doesn't call yet)