Some work on the datatype interface

Change-Id: I48276232e27782dc516ff2e54c874e6434c9ccc6
Merge "Some work on the datatype interface"