Changes server-side should make it a little easier to parse QAM.