Make it possible to pass extra options