UiComposer Improvements - ContentObject improvements