Updated PSAP simulater to handle the new MSD structure