Refactoring to introduce an IMAGE node type