Found better solution for persisting multiple items. Added TODO with the
link in the class where it should be used.