Switch params order and allow full options object