adapted to support ui5