Added functionality for multiple UI types