CLI scripts for wu - plus model changes for locations to be separated