Added examples, and ported handlers