improve Device entity