Core updates according to upcomimng UI