Also added ui support for multiple complex item types