Added support for Tablet