Image inclusion refactoring