Add options param, improve errors management