Making library more universal (slowly adding more devices.)