Updated device build