Added photo support for various picture types