No longer include UI in all objects