Added support for tablets