Removing duplicate object types & fix async hdr