Added data manager class