Changes to Handling/BasicExamples