Finish multi-ID machine support