Added device definitions