Update of the wrapper class

Possibility of choose the filename added