Change to handle current primo simpleserver format