Better title change support