Make work with TMSCommander