Adapt right object structure for ui modules