Fix issue (1) :
Add : improved interface