Feature/#67 manage multi storage