Now accepts list and tuples