@amagdas do you think it's fine? rather then referencing upload item i'm using media storage id so it can be fetched without this extra lookup