Added data handling