Adding more structure to the examples