Added tablet support