BI-352
Do not use UnmodifiableList