Minor refactoring
Recreate examples