Rewrite examples for new architecture