Update DataTypes extension

Change-Id: I855b1a27551da6e251aee1e11964862bedb73a26