Upgraded uicommons