Finish multi-device support