Models for the images and albums have been refactored