Replace Datum with a container object

@gtrogers
@pbadenski