draft version to add new types of data