Handler type updates