Added Device class