Feature/thumbnail

Adding thumbnail support for 2.0