Renamed size constant
Beginnings of device support