Moved to OrderedDict
Added booleans in single item litst
Added booleans in single item litst