Added data manager, working on data types