Handler implementation changed