Added support for question images