Added type metadata
Added image types