Update from Manoj for thumbnail