[FIX]: added new fields to store different size of images and small improvements
[MERGE]: merge