Updated to use the package changes in UI