Allow options to be passed as second parameter