ImageServing refactoring before adding to ContentPatterns
ImageServing added to ContentPatterns
Refactoring