Added DSM-X support