Added in new object types to support more formats.