Updated to reflect UI generation parts