Custom code moved to XMLUI