Added support for image uploader