Add data structs to ui-system