Added system assembly location detection support