Add some more options, the options are now depending on the order given to the util, need to be fixed