Add full support for pictures