Some suport for small devices added