Added some data types, DataManager