Minor CustomDataModel changes