Improve the MAS client protocol