Initial work on adding an Attr to all Image types