Start reworking examples for v2.1