New changes in structure, add examples