Changed type checking for options to handle iterables