Added more structure to match example