Changed to new data type framework.