Add support for images

(rebase me with organization to Sites change)