Added more 5.3.0 handlers by raknar