Add some more client message parsing