Big overhaul of Data library