Add device control to builds