Tony/Chris - Code refactoring for ProductImage and ArticleImage.