Ming Jin: add non-image support