Added missing data handler cases -- note bene: these are not complete