Added chunk based data storage