Changes to structure and examples