Add handler callbacks, close #673