Added support to data_structures.