Migrate to using an ImmutableArrayList for storing data as the lists should not and cannot change