Updated handlers examples