Refactor to add more examples