update to Device model