More device model improvements