Adapted latest examples to new Core