{MAc} Factor out support lib list and add XIOT capability