Added support for pictures