Ui model improved: avoid returning null