Add ability to override form of the content item
Add thumbnail type flag to Image