Use hash parameters

So it can be more flexible in the options you accept