Modifying HTML slightly for easier binding