Refactoring image store