Added methods to data handling