Added data handling class