Support passing options as the second argument