Options now takes a Dict and makes it OrderedDict