add Handler. fix sample.