Fixed examples after refactor