Add support for picture selector