Fixed the current device creation and updation.