Added support for ui changes