Added little support for Tablet and Handset versions.