Added support for gallery