UIHandler changed according to API changes